cleaning up master as well