Revert "couple clean ups for spawn"

This reverts commit 77379b00df2fe0d2a75b8dd6d738d4eec5d6622a.