Remove unused code sections