Removing more unchecked gets