remove extra worker stuff, closes #532