cleaning and matching to svn