cleanup of new database field logic, though I don't think it's working yet