Remove Builders namespace