Small cleanup for akonadi before re-packaging the port.
Small Soprano cleanup before submitting.