Empty evict

The changes for #437.