Merge "Delete dead code which had adverse performance impact." into sc-dev