Final API cleanup