Refactored torrent removal