Cornsilk 14 14 acu175615 release5.2 cleanup

@dominicm 
can we get into this code before any data was received?