Pruning plugin logic from codebase, more design is required.
Merge branch 'master' of github.com:swong15/shim