Removed the old markup and comments