Removed some self-preservation logic