Menu clean up