FW-254. cleaned up r6t.