Simplify

Change-Id: Id6dc46c8b24441481d950ef0423da800a0f2ed9d