Removed unused code
Updated to contour 2.1.0.beta10