took out deletions of code