Cleaned up more files