removed some TODO marks