Clean-ups and infrastructure preparation