jumbled around classes and got rid or useless ones