Improve code logic for plugin-shim
Delete unnecessary specs
Rebuild packages