Removed invalid TODO
Removed unnecessary extend