Simplify and cleanup previous commit.