Clean no-lock-twice comments
Dead code