More clean ups. Now about to start clean up of Data classes.