trying to refactor commit, but too many tests failed
removing new class