Fix an issue I added while fixing LINT issues. Also, be sure we delete the no longer unused field.