First cut at cleanup of pages