Recommit the correct parts of 55eb5e28f52c9cdccc6229a8314ffbdac2260843, apparently I didn't actually look at the 'Changes against parent' section this morning. ------ Remove a variable that isn't used anywhere, if it was supposed to do something feel free to add it back and make it do that. Also, fix a compile error. Comparing a string literal and a const char * with == likely doesn't do what was intended here.