Clean ups, removals and additions.