Remove old buggy code