Cleanup takeout/addback