minor deletions etc