Remove unnused imports
Add _default_token_type for the server