removed unused variables
misc