Cleanup + new entry.