More documentation code cleanup