Get rid of nitz properties, they keep erroring and dont seem all that helpful anyway

Change-Id: I6cb03056c73473262425e8d845aa3a9793a2461b