a little clean up from last merge