removed unused variables
v2.0.2