Remove some premature changes