cleaning up after many months of modifications