Removed DDC-3380 mentions in production code