svn fixes, remove obsolete code