Remove unused code blocks