Got rid of more unused crap.