Build now completes. Cleanup script uncommented.