XD-1254 cleanup per review