Lots of cleanup of original, pristine copies of class files