Continue cart refactoring : remove old stuff