Follow-up to commit 33194a0ae6d5543119a15e18155f906ebf57eeea - Remove some gameobjects still remaining in gameobject & gameobject_addon (cherry picked from commit 6feee74c5aa5e5724e80bbbf546c4779ec1e648a)
Follow-up to commit 33194a0ae6d5543119a15e18155f906ebf57eeea - Remove some gameobjects still remaining in gameobject & gameobject_addon (cherry picked from commit 6feee74c5aa5e5724e80bbbf546c4779ec1e648a)