removed some TODOS