core cleanup: separate code for make call menu entries