Added Class Cleaner