Remove unused code
Fix import