more updates and removals