Simplify controllers and services