some API cleanup