Ditch middleware again