I think so to.  Also, I will leave the "on-demand building" in place as well to cater for the removal edge case