[API] Cleanup