refactor out superfluous class