Got rid of useless comments and messages