Removed unnecessary TODO comments