cleanup mappings and plugins
make changes to match origin