Removing some useless variables