got rid of classes