Clean up unused variables