Merge "Code clean up: remove some dead code."