yeah .. kill whatever logic we have duplicate in the loaders.