simplified

Change-Id: I27e9c7dcdea328f63bcb19ef7dcb5a2e821c0db2