import and usage cleanup