Move all this stuff to community, there is no reason for them to stay in main sucking up valuable maintainer and developer time