Removed non-working vars