fix comment and error
remove unused variables