removed some un-needed variables