Get rid of more unused crap