diff --git a/include/maestro/i_pool_manager_registry.h b/include/maestro/i_pool_manager_registry.h
index 50591c06810b9f0947726ddd15a454cc5873da77..05780aa324a2b426e980ccd0c6de6776f07d363e 100644
--- a/include/maestro/i_pool_manager_registry.h
+++ b/include/maestro/i_pool_manager_registry.h
@@ -324,57 +324,6 @@ mstro_pm_candidates_destroy(mstro_pm_candidates *candidates);
 
 
 
-
-/** If a CDO has is_distributed flag set at the mstro_pm_cdo_registry_entry but
-  * the cdo handle does not has a distribution defined,
-  *
-  * we cook up a default distributed for it, which consists of one piece holding
-  * all the cdo data */
-mstro_status
-mstro_pm_cdo_create_default_dist_layout(mmbLayout *src_layout, mmbLayout **default_layout);
-
-
-/** Convert the mapping between two distributed layouts found by mmb_layout_compute_intersection
-  * to a list of candidates (apps, local cdo-ids, offsets, lengths) that satisfy
-  * the requested distribution from a different source distribution.
-  * Return MSTRO_OK on success.
-**/
-static inline
-mstro_status
-mstro_pm__mmbLayoutIntersecton_to_candidates(
-                            mmbLayoutIntersection *intersection,
-                            size_t dst_index,
-                            mmbLayout *src_layout,
-                            struct per_app_cdo_entries *app_to_attributes_table,
-                            mstro_pm_candidates **candidates);
-
-
-/** Find an offered distributed cdo with the required exact layout
-  * (including index),i.e., 1:1 mapping
-**/
-static inline
-mstro_status
-mstro_pm__find_cdo_with_layout(
-                          struct per_app_cdo_entries *app_to_attributes_table,
-                          mmbLayout *s_layout,
-                          struct per_app_cdo_entries **app,
-                          uint64_t *local_id);
-
-
-/** Create and allocate  mstro_pm_candidates needed to hold the list of
- * applications and local cdo ids that fullfill the current demand
-**/
-static inline
-mstro_status
-mstro__pool_create_candidates(mstro_pm_candidates **candidates, size_t length);
-
-/** Destroy mstro_pm_candidates **/
-static inline
-mstro_status
-mstro_pm_candidates_destroy(mstro_pm_candidates *candidates);
-
-
-
 /**@} (end of group MSTRO_I_PM_Registry) */
 /**@} (end of group MSTRO_Internal) */
 
diff --git a/maestro/cdo.c b/maestro/cdo.c
index 449551aa83394f9724f52828f8ef6d2d675cfa8d..6e0714b69e93713d99636ca00b003883b0f1147f 100644
--- a/maestro/cdo.c
+++ b/maestro/cdo.c
@@ -1477,6 +1477,10 @@ mstro_cdo_offer(mstro_cdo cdo)
     return MSTRO_INVARG;
   }
 
+  WITH_CDO_ID_STR(lidstr, &cdo->id, {
+      WITH_CDO_ID_STR(gidstr, &cdo->gid, {
+          DEBUG("Offer of %s (lid: %s, gid: %s)\n",
+                cdo->name, lidstr, gidstr);});});
 
   if(!mstro_cdo_state_check(cdo, MSTRO_CDO_STATE_SEALED)) {
     if(mstro_cdo_state_check(cdo,
diff --git a/transport/transport.c b/transport/transport.c
index ba7796824ffa151120683af4f2d4e5d6ebbad095..0ed0cf0d5fb025b87b74d35d26e203be733ff0df 100644
--- a/transport/transport.c
+++ b/transport/transport.c
@@ -176,7 +176,6 @@ mstro_transport__src_datalen_get(mstro_cdo src,
     dl->data = src->raw_ptr;
     DEBUG("CDO size is %zu (from ticket, attributes say %" PRIi64 "), raw data at %p\n",
           dl->len, src_size, dl->data);
-
     }
 
   NOISE("CDO size: %zu\n", dl->len);