Remove unused defines with names that too easily conflict