Removed some variables not using yet