[DD-854] code clean-up pt. 2