remove all the bad stuff from master