Reformat code

* remove some code that was commented out

Change-Id: Ifd8c1209f5f9161d9dc0fe4409c9a5a6faad7b94