removed some dumb mappings