OS-2804 clean up mdb related merge noise