fixed auto cleanup