Minor cleanup of menues to remove items not to be include in the first version