removed some todo stuff