REMOVE DUMMY CLASSES -  DOES NOT WORK CURRENTLY