Clean up Key enum