Remove unused code; Add delegate method for progress tracking