clean up some abort logic