Cleanup

Long overdue.