More cleanup of stuff I've not used at all