Remove unwanted packages & add missing strings

Conflicts:

	res/values/cm_strings.xml