(chore) delete a whole bunch of things from master