Cleanup Intent Service #1325

Job	Run time
unit_tests (3.7)	2m 0s
unit_tests (3.8)	1m 46s
util_tests (3.7)	5m 52s
unit_tests (3.9)	2m 2s
util_tests (3.8)	5m 18s
unit_tests (3.10)	1m 47s
util_tests (3.9)	5m 17s
unit_tests (3.11)	1m 53s
util_tests (3.10)	5m 21s
util_tests (3.11)	6m 20s
docker_build_tests / docker_build_tests	1m 54s
py_build_tests / py_build_tests	7s
py_build_tests / relative_path_tests	5s
	39m 42s

Provide feedback