Simplify gir environment