Remove recoursive calls to constructor