remove FlexibleInstances and add ETag-related things