cleanup HandlerFactory