Remove unnecessary extend