#15 Remove logging