Remove Menu feature, needs a rewrite