Made some more cleanup in old-sources