Another try to clean up master