Simplify previous commit