Remove more useless comments
merge fix
merge fix 2