less markup

still stripping out old markup