Remove circular reference checks from build (they belong in resolve)
Simplify build and add circular reference tests to resolve
Futher simplify build