Drop file with un-used observer and childContainer cleanup
Merge pull request #4184 from mixonic/drop-childContainers

Drop un-used observer and childContainer cleanup