More API cleanup