Cleaning up master control