Remove unused variable
Add more debugging information