Cleaning up services and controllers