Add some todo and remove commented text