Cleanup
Fix -Wunused-variable warning
Try to raise the warning/error limit