Remove some probably unnecessary changes