Fixes for remove