Remove more unused defines.