master clean up