#22 Remove logging