Tweaks to compiler classes and service definitions
Remove unneeded service definitions