more middleware removal