#124 - Additional Data Clean up