Fixed few bugs on removing of CMenu