Use correct combobox
Remove uneeded files and lines
Merge pull request #729 from owncloud/use_correct_combobox

Use correct combobox