Code clean up found by Brady