More Doc cleanup