Removing todo comments, theyre done