Remove some changes in files that are not directly related to this work.