Changes to fix remove-keep