cleanup of unused crap