remove bc's
Merge branch 'zabr2'
remove unused values