Removed some usused variables