remove commented out code

and fix up some formatting

Change-Id: I8d24c66901eeaf8a6c7aa5e797821c807edaf6ee