Remove unused packages and var typo