remove old non working option
Merge branch 'release'