Cleanup, change + upgrade of libraries