Remove unused variables and redundant comment