Removed unsed variables