Bug 999868 - cleanup