Clean out middleman boilerplate