remove unneccessary classes
fix typo breaking function calls - all tests pass