Clean up a bunch of unused variables