Cleanup some plugins and mappings