master: a-0 clean up