Removed space in widget name and removed commented out code.

Change-Id: Ie5209393bc958eb575d9ddd1055c3a019ecfa1ba