[no-ref] code clean-up