cleanup: keep the master clean