some prelim cleanup