cleanup in cleanup.. :-)