Merge "Remove some dead code"