finish removing AuthorizationServer, to close issue #8