More tweaks to poprun, remove some leftovers