Cleaned up many files