Remove all references to Codemark class
Merge branch 'kill-codemark'