Cleaning methods in remaining classes