Uncommented SystemConsumer logic previously removed

Added reminder TODOs for hard-coded sections (to take them out later on)