Cleared even more files to reflect v1.8.4.2