Revert "commented out prevent defaults in remover"

This reverts commit 781f668de01d207bd4cc2110f982a23b40f53b0d.