[3.9] Api cleanup