rm some needless abstraction