Remove dead code

Deprecated some config options.
Merge branch 'master' of https://github.com/lyze/hsop-git