whitespace

Change-Id: I201df99ad64416d85b83fd67658a06ad974efb0e
remove commented out code

Change-Id: Ib28b0b61a4d5ecaf743e4b1f9d7c45b4bb288ffa