Removing unused, so-far unnecessary abstraction