Simplify plugin registry
Remove unused code
Use Object.keys().map to simplify
Minor cleanup