Tidy ups - removed uneeded packages, corrected versions.