#254 - Severely reduce memory leak (also temporarily disable expanded tasks)