Cleanup of libraries we don't use anymore