RM6785: Remove no-op props

 * also sort existing props

Change-Id: Iadadd33cb4dd0ed9096cb41a41f20bb59f93c372
Signed-off-by: SamarV-121 <samarvispute121@pm.me>
5 files changed