Cleaning out classes for new version.