Removing some unneeded statements