Menu cleanup (cf. #49)