API: General cleanup