[FIX] removed unneeded variables