Super basic cart service and more cleanup