all removal of Groovy code in service mod
fixing scala warnings