More logic fix for remove method