add back in ifdefs
make creation of no_clash subspecs automatic