Removed LockClock and Updater