cleanup for faster data loading