Remove workaround for empty results