Continue to remove redundant setup stack states