diff --git a/modules/conop/src/nonstandard.cc b/modules/conop/src/nonstandard.cc
index 5effd8d9014ca886d63bb50f5457cc487fa782f0..b8f09f283e7676be010b2a1b0720b60001536354 100644
--- a/modules/conop/src/nonstandard.cc
+++ b/modules/conop/src/nonstandard.cc
@@ -35,50 +35,6 @@ using namespace ost::conop;
 
 namespace ost { namespace conop {
 
-namespace {
-
-bool CheckBackboneAtoms(ResidueHandle res)
-{
-  String atom_names[]={"N", "CA", "C", "O"};
-  std::vector<String> missing;
-  for (int i =0; i<4; ++i) {
-    if (!res.FindAtom(atom_names[i])) {
-      missing.push_back(atom_names[i]);
-    }
-  }
-  if (!missing.empty()) {
-    std::stringstream ss;
-    ss << "residue " << res.GetQualifiedName() << " is missing atoms ";
-    for (std::vector<String>::const_iterator
-         i=missing.begin(), e=missing.end(); i!=e; ++i) {
-      if (i!=missing.begin()) {
-        ss << ", ";
-      }
-      ss << *i;
-    }
-    LOG_WARNING(ss.str());
-    return false;
-  }
-  return true;
-}
-
-bool CheckCalphaAtom(ResidueHandle res)
-{
-  String atom_names[]={"N", "CA", "C", "O"};
-  std::vector<String> missing;
-  for (int i =0; i<4; ++i) {
-    if (!res.FindAtom(atom_names[i])) {
-      missing.push_back(atom_names[i]);
-    }
-  }
-  if (!res.FindAtom("CA")) {
-    LOG_WARNING("residue " << res.GetQualifiedName() << " is missing CA atom");
-    return false;
-  }
-  return true;
-}
-
-}
 
 bool CopyResidue(ResidueHandle src_res, ResidueHandle dst_res, XCSEditor& edi)
 {
diff --git a/modules/mol/base/pymod/export_entity.cc b/modules/mol/base/pymod/export_entity.cc
index 6fda49c793342259e0d3ab5078716d3dda8c0a5e..e1e3ac4094f192223bf18349d7c371098d0a036b 100644
--- a/modules/mol/base/pymod/export_entity.cc
+++ b/modules/mol/base/pymod/export_entity.cc
@@ -63,15 +63,10 @@ ICSEditor depr_request_ics_editor(EntityHandle e, EditMode m)
   return e.EditICS(m);
 }
 
-bool less_index(const mol::AtomHandle& a1, const mol::AtomHandle& a2)
-{
-  return a1.GetIndex()<a2.GetIndex();
-}
-
 
+#if OST_NUMPY_SUPPORT_ENABLED
 PyObject* get_pos2(EntityHandle& entity, bool id_sorted)
 {
-#if OST_NUMPY_SUPPORT_ENABLED
   npy_intp dims[]={entity.GetAtomCount(),3};
   PyObject* na = PyArray_SimpleNew(2,dims,NPY_FLOAT);
   npy_float* nad = reinterpret_cast<npy_float*>(PyArray_DATA(na));
@@ -93,17 +88,13 @@ PyObject* get_pos2(EntityHandle& entity, bool id_sorted)
     }
   }
   return na;
-#else
-  throw std::runtime_error("GetPositions disabled, since numpy support is not compiled in");
-  return 0;
-#endif
 }
 
 PyObject* get_pos1(EntityHandle& entity)
 {
   return get_pos2(entity,true);
 }
-
+#endif
 } // ns
 
 void export_Entity()
@@ -208,3 +199,4 @@ void export_Entity()
     .def(vector_indexing_suite<EntityHandleList>())
   ;
 }
+