Removed some un-needed variables