Tidied up - commented-out unused libs.