API: Internal cleanup