remove delete_gw hack