Cleanup multiple codepaths