Version two of cleaning up info pages