master: more clean up