Remove some testing changes