Remove the unnecessary abstraction level