Revert unneeded code