cleanup remaining defines