Fix cleanup
Cleaup after builder test