12 Commits (optimize-delete-lookups)