Cleanup from previous author