SLT-645 minor cleanup