Cleanup for full data load