Cleanup warnings

Clean up some unused variables.