Remove logging, comments