cleaning up restaging implementation