Remove LockClock as well, refactor removal