Removing stuff that was not removedn in last changeset.