removed dsms
code style
revert async
some cleanup