contour code require cleanup