revert some obsolete changes