removed unused variables

code cleanup: removing unused vars