Finished bearer handler, removed some stuff from the middleware