#1 - Making the auto-populate on actication more performant, and cleanup