Removed TODO about optimizing has_many sort