Code cleanup, automatic handling of deleted default spawn