Some API cleanup