Could you remove lines no longer needed rather than commenting them out... This is more readable...