Remove extends

Some places are updated in 2.0.