Remove excess function
Add ability to survive when can not start new worker