Revert "Add valuetypes"

This reverts commit fa0c51f823b6c4d41ce0432a4b618c7fcee98174.