Got rid of SubnetBlob too, down to one file