slight cleanup of extraneous imports