Started removal of Cubes framework as dependency