removed old markup