Fix some minor warnings, including commenting out some old code.