more cm-10.1 stuff and cleanup

Signed-off-by: JamieD81 <jamied81@gmail.com>