further API cleanup