menu xml and event cleanup