Cleanup RegisterSpawn and remove duplicates when registering