removed old markup and comments