Cleaning up the master