Remove unnecessary authorize and callback blocks