update menu; cleanup