CON-2172 | Remove it more forcefully