Revert unnecessary minor changes