Big cleanup of doc