zeph1e Fix cleanup