clean up merge from c5