more cleanup, superclean