Removing CyanogenMod specific options from Settings and fix the modversion

Change-Id: Iad547bdebc525b5dcf16a7f93f808afc431d49d7