1. Removed obsolete code.  2.  Improved UI update after CV terms updated.  3.  Code simplification.