#1 - clean up and finalize Menu domain