moved to weld 2.1.0.Final
minor refactoring in DefaultEngine and cleanup