Removed unused TODO
Fixed issue with cli