More cleanup

More removal of crap from when I was working at some job.