cube refactorisation - removing bloomber related code (as per Elaine suggestion)