As pessimistic as it may sound, I would throw away all the new changes and leave the platform as it was before. That is, LeoFinance and LeoThreads existing together as they have, and not this mango rice we have now.