Cleaned up various files