Removing unneeded warning/todo