revert some unneeded changes