Some cleanup after merging features/streams-access