revert some unecessary stuff