Remove redundant code closes projecthydra-labs/engine_factory#15