[WIP][3.9] Api cleanup