Clean up of debugging traces
Added TODOs