more effing clean-up