Cleanup from the last commit.