Some code deletions