cleaning up master since not done for some time