Changes to worker and token removal