Call cleanup before handlers for menu

[npentrel]

With the way menu's work I don't think we should require users to call the _cleanup method. The underscore is supposed to mean it's internal anyway

[npentrel]

@MatthewWilkes and @hughrawlinson how do we feel about this?