removed improductive optimization