Get rid of codemarks class completely