Some changes and removals