many changes and removals