Remove dumps optimization