Remove unused imports/variables