more refactoring, remove 'TopLayerFetched' notification