More API cleansing