further trimming, now we can customize
further cleanup