Code Optimization

Please validate and test
Removed unneeded service def

Tested a service plug in and forgot to remove the def data