rm management

some missed cleanup work.