more API cleanup