remove logging and comments