More integrations cleanup