Whitespace fixes and rm debug code

Change-Id: I67234f11b4bef91314d52c2c5a05ac011a83caac