collector: removed lock-control crutch