Remove unused crap