Cleaned up even more files