got rid of list of classes