Move setup of aggregator.safe_layer from aggregator.deintersect to aggregator.setup_layers