More code cleanup (old SVN tags mainly)