Remove cm references and configure for OctOS