Undo some Server changes
Remove StreamAction