Remove more sneaky changes which are not required for pull request