Improve portability
Remove unused variable assignment