remove isSingleton usage warning
remove handlerContext usage warning