Eliminate LockChangeListener