Merge branch 'ontake_cleanup' into ontake_cleanup_client #2299

Job	Run time
build-and-test / build	9m 38s
deploy_bridge-ui_hekla_production	0s
deploy_bridge-ui_mainnet_production	0s
deploy_bridge-ui_mainnet_preview / build-deploy	49m 33s
deploy_bridge-ui_hekla_preview / build-deploy	49m 19s
deploy_bridge-ui_devnet_preview / build-deploy	4m 31s
	1h 53m 1s

Provide feedback