you are walking a RAZOR thin line with those tanks my friend, I coulda swore I saw someone with a similar tank to yours...anyway, look it up and you'll find that neither can adequately house the TSN or the barbs. You are\will be overstocked and you should restock or upgrade. Either way, it sounds like you had these fish before those:
Pacus
Irredecnt sharks
Catfish (pictus maybe)
Tiger Oscars
Upside Down catfish
Severums
5 of each maybe?