Cleanups...

These are a couple of various cleanups and small changes that have been building up in my repo. Mostly deleting unused files.