removed unused code
Merge branch 'master' into firefox-conf