Nice cleanup - was this required? Or just a code smell thing?