Fully Eliminate the 3rd feature

More changes are made to eliminate the 3rd feature.