Removing the Endpoints handler