Cleaning up master