semi-clean-up of toplevel