Removed outdated TODO's