Fix removing data logic