Removed some middleware references and a test