Simplify last commit