Remove unnecessary abstraction