Remove simplification steps
Add graphie