Get rid of 3s/OLDSTYLE, start to exclude old code