[IPTorrents] Some more simplification