Merge "Cleanup leftover commented code."