Cleanup the circular dependency in the build