OCD clean up and add GSM Note 2