GI-872 Final cleanup