Removing remaining folder from botched svn-merge.