I might have misread this comment--did you intend to remove some code?  Did you do so?