Remove LockClock from system

Change-Id: I1acc8111395ef7d9b45e81277d105fb6d07d86a5