Removed Handlers and Adapters not used