Re: Review Request 220: clean up imports