[DF-4296] Full refactoring of add / remove logic for SceneSystem