Remove unneeded abstraction