changed mappings, removed plugin