More removal of references to JDO