Removing unnecessary class property

Change-Id: I95ee3fe091c97a7609db91e9ea1905d5c42d209b
Merge "Removing unnecessary class property"