prune dead code
clean up loader
Merge branch 'master' into cleanup-loader