code quality: update use statements

part of #843