Added TODO note for produce/parse cleanup/consolidation at future date