more clean up from merge from c5