fixing some unused variables, removing a comment