Clean-up infrastructure.