Removal of stuff related to the move to master.