Remove logging and comments