Some API house-cleaning