Code refactoring
Remove unused variable