Refactored remove download, need to take care of the async issue later.