clean up from last merge