Remove LockClock

Change-Id: Ie2c7ebfd81e7595ae604efa636bbde05a68e726e