pepper: prop cleanup

Change-Id: Ic32057629be160b2ed9661eab50765e942d63e16