Mp/tk/code1 cleanup