Polished the rollup and remove code a bit