remove some unnecessary labels and code
this seems no longer necessary