XD-1368 Some final clean up per review