Remove useless comments
Rename