Not needed anymore.
Simplify yml more