API cleanup, docs update