Some cleanup before writing the docs