Update to latest Westlake
Clean up the scan