cleanUp

clean up off files after merge problems