@lefnire => Move deprecated API back to deprecated

And clean up middleware a bit to use express inline.