remove unused constructor argument and private variable af
Merge branch 'unused_af' into bsd10