Ripping out custom stream queries