cleaned some dynamic value code so that persistd doesn't need the .o file