Remove unused code that's buggy