Remove deprecated conditions on has_many/one