Cleaning up bugs in worker