Removing dynamic population and refactoring the population builders