import/code cleanup