Removed unneded class variable, minor cleanup

Change-Id: Ia59e9b0c0f418924216693e8ddbf8010a15d8a89