clean up some return code

remove some left-over cruft