Minor cleanup - irrelevant variables