[quote=@Gowi]
I can also drop Xaara's sword-savy trait if needed. Her character is developing in my head differently, so I don't need to justify the sword anymore.
[/quote]

Well it IS a MASSIVE inconvenience for EVERYONE. 

(I don't think it is a problem at all.)