Removed dead code
Formatted source
Disabled logging