Removed the TODO section