Taking out unneeded variables