Ajay/DC | #000 | Cleanup - Removed commented out code
DC/Ajay | #3366 | Adding onoff widget