Deleted address types, resolved bugs with order_id in controller