More value schema cleanup