Remove prepopulation
Refactor audience app