l2: API cleanup