Cleanup redundant code after last commit.