remove unnecessary function from cart
clean up code for country