Simplification

No failing algorithms