Marc: [sample] clean up imports