Remove more unused keys