move actions out of services, simplify