remove unneeded abstraction