got rid of unnecessary classes