3.1 CLEANUP

git-svn-id: http://sunny.svnrepository.com/svn/sunny-side-up-general/sifr/trunk@5558 7b40dde9-fc51-43d4-b609-63a66f0a0cee