removed unsed vars