Remove explicit functions for start/stop gathering and include codes in service_app_c...