Remove commented code from address form template