This reverts commit 96686b95. broke sampler file loading, fix approach in sampler_fix branch, not there yet