initial rip-out
cleaning up imports
cleaning up builder ctor call