Small cleanup of `use` statements