Revert some non-needed modifs