Final clean up commit.