Kill some warnings and dead code.