Cleanup LVS checks

Change-Id: I1f9fe6b3ae44084f21abf9f2e9a7de03f5a9a342