clean-up should work now