removed STATE_DEAD and conditionals based on it