Large-scale API cleanup