fixes for remove