Clean up unused markup