2.7 code cleanup and fixed issues due to cart change