more minor deletions