Remove unused TargetOptions code that does not get passed to engine
Make EngineBuilder passes TargetOptions properly