more cleanup
move batch extraction logic into WorkSpace
change to the way profilers work