misc refactoring

* remove some async response for removing warnings