revert some obsolete changes
some self-code-review