Are you planning to do this or should this commented code be removed?