Removed old partial static logic that was commented out