[No QA] [Better Expense Report View] Clean up remaining nested follow-ups & added code#60179