sync with svn, remove rapleaf