remove unused code and fix typo
Merge branch 'gentoo' into rabe