Clean up warnings, mostly unused variables