made some changes, mostly deletions