Cleanup from last commit.