LB-1504 Review clean-ups.