API housekeeping