rm management

some missed cleanup work.
Add this back?