Various updates and removes.