no need to create threads
Merge branch 'field-cleanup' of github.com:antler/caribou-core into field-cleanup