Removed some debug-era comments from the composite-data classes