Cleanup ValueSchema api