And even more code cleanup - Gary