Removing unused code blocks