Propel fixes due to new version
Remove static classes service definitions