force remove
original implementation refactored with original functionality restored.