Also clean coordinate keys