Cleaned up many duplicated files