Fixed odm2 references.  removed odm2 as submodule.