Remove menu provider cruft