Fix the remove_tax option