Removed global middleware, added to client-views