Cleaned up infrastructure.