Remove builder integration layer as it is of no use in our case.

Fix #36