LPS-31465

This is a preparation clean up for the upgrade performance improvement.
Please leave the ticket open, after fixing the upgrade performance improvement, I will go back to work with sara to finish the unused finders removal, after that we will come back to check through all unique indexes to finish LPS-31465.

Sorry, I know the whole indexes changes are getting too big and messy. There are too many dependency among all the stuff that I need to change, I will have to jump back and forth make sure at any given time the product is consistent.