Remove un-necessary extend for now.