cleaning up master