Merge "Remove leftover commented out code."