Mali/ump: merge cleanup