Minor cleanup: Removed obsolete variable declarations.