Revert "move CLock to user interface"

This reverts commit 7d8c02c3ee3a6cbfe1cbd2d837d0cd5362e0eb44.