Added further cleanup and svn status information