remove uses of SimpleValue