Remove api selection from prepare-space
Extract system helpers from firewall