Clean up unused variable warnings