Removed some TODO entries