Remove commented out code

Change-Id: I0813a7594774d34b798fc8be316cfc325d4e4a95
Merge "Remove commented out code"