Remove unused constructors
New model for V2 deals
In support of V2 API cutover, minor refactor to V1 API