Nice work with the conditional shipping server behavior. When it comes to the checkout page and confirm pages you can use your same logic to only show these parts when there is a weight in the cart. If you have server validations occurring for the shipping info from the checkout page then you can use your if statement to prevent these from occurring if there is no weight.