- Remove duplicate code from last commit.