removed stray files that resulted from botched merge