Move package of circle/ellipse fitter so service can be removed
Remove references to fitting service
Clean up warnings