Extensive doc cleanup