removed todo comments