Removed all the junk from master