added todo and removed unneeded property