Cleaning up autospawn/UUID use