Some deletions and fixes