cleanup some obsolete code
synchronize creating bundlerFacade