removed todo and fixme