XD-1343 clean up