XD-1249 - Clean up per review