General API cleanup