API cleanup work