removed discount factor
build-impl cleanup