cleanup deprecated code.

My rebase/merge of the nice MR !41 (closed) on current git head. Added a fix for a crash I was experiencing. Started using Amarok built with this MR applied today, will remove the Draft prefix after I've used this build for maybe a week or two if there are no problems. As the original merge request alters the codebase very broadly, any usage testing by a single person is probably very far from comprehensive. However, it's a start. EDIT: Used Amarok built with this MR for some time now and haven't encountered any issues (apart from the ones now fixed in this MR), so removing Draft: