Removed TODOS