Cleaned up a few more files