Remove unused variables
Add new warnings