Remove unused keys, closes #28