bug 1288: Some cleanup as this is never used anyway