Removed some TODO markers