Clean-up following long hiatus.