Clean up of page structure