somemore cleanup