Removed left debug code
Finished replacing log with timber