Simplify middleware, don't use superclass methods to keep code the same, refs #4