code cleanup bugid-43207