Checkout form @extend usage removed
Checkout review page cleaned up from @extend