Version 3 of cleaning up info pages