TrinityChat: More cleanup.