removing some classes that are no longer used