Removing unused variables. Please verify