Groundwork for Result cleanup