Please add a bug for this.  The service and node files should be merged.  A single calibration node should be capable of handing both modes of operation.  There's too much common code in them.