cleanup and fixes for secondary data updates