More cleanup on worker side