[builder] remove deprecated code