Clean up EntryType