Remove further unnecessary abstraction