Remove unused members

Change-Id: I39b12a6290d13a5404dae60b0b16548b035f24d8