Seeing as Battle of the Bards got moved to Narsis, instead of Andothren, the two related bard NPCs -- Moreth Helsim and Rajjma -- should get removed.

Possibly, the downstairs stage on which Moreth stands should get removed also, and the resulting space used to space out the NPCs in this crowded inn.

The innkeep's dialogue may need a once-over as well, to remove any possible mentions of this rivalry.