Remove 2 more ancient props

Change-Id: I59802ea39760c0c3b40598bd8616b876b04a0b51
Merge "Remove 2 more ancient props" into jb43