Removing some initial extras that we don't need.