Merge "Remove old debug code from fixed bug." into sc-dev