master: cleanup