Remove populate_all and populate_single