removed unsed variables