Remove cm-10.1, cleaner conditional statements