Removal of old menu-implementation