cleanup prop files

Change-Id: I59188ca7c56c5b9ccba031bc71ca556f29352557