Cleanups

Cleaned up a few files