Merge "Remove long standing debug code" into oc-dev