removed logging and useless comments