CE-4 Some clean up before pull request