Further doc cleanup