Fix old API cleanup