Removals, updates, and cleanup