Some fixes
Force Removal