Remove some non-master changes