Changed stream remove to be disabled by default