nypon: prop cleanup

Change-Id: Ifa33a950a57264e9a8586252076ab91739c57dec