removed todo stuff