diff --git a/terraform/eval_context_builtin.go b/terraform/eval_context_builtin.go
index 70583b2f6..15f1f08ab 100644
--- a/terraform/eval_context_builtin.go
+++ b/terraform/eval_context_builtin.go
@@ -148,9 +148,6 @@ func (ctx *BuiltinEvalContext) Provider(addr addrs.AbsProviderConfig) providers.
 
 func (ctx *BuiltinEvalContext) ProviderSchema(addr addrs.AbsProviderConfig) *ProviderSchema {
 	ctx.once.Do(ctx.init)
-
-	// FIXME: Once AbsProviderConfig starts containing an FQN, use that directly
-	// here instead of addr.ProviderConfig.LocalName.
 	return ctx.Schemas.ProviderSchema(addr.Provider)
 }
 
diff --git a/terraform/eval_context_builtin_test.go b/terraform/eval_context_builtin_test.go
index d1be2ba7f..45343c0f3 100644
--- a/terraform/eval_context_builtin_test.go
+++ b/terraform/eval_context_builtin_test.go
@@ -64,10 +64,6 @@ func TestBuildingEvalContextInitProvider(t *testing.T) {
 		},
 	}
 
-	// FIXME: Once AbsProviderConfig has a provider FQN instead of an
-	// embedded LocalProviderConfig, use a legacy or default provider address
-	// here depending on whether we've moved away from legacy provider
-	// addresses in general yet.
 	providerAddrDefault := addrs.AbsProviderConfig{
 		Module:   addrs.RootModuleInstance,
 		Provider: addrs.NewLegacyProvider("test"),
diff --git a/terraform/module_dependencies.go b/terraform/module_dependencies.go
index 4330d5ac3..2e590a372 100644
--- a/terraform/module_dependencies.go
+++ b/terraform/module_dependencies.go
@@ -192,8 +192,6 @@ func configTreeMergeStateDependencies(root *moduledeps.Module, state *states.Sta
 		module := findModule(ms.Addr)
 
 		for _, rs := range ms.Resources {
-			//FIXME: lookup the provider localname in the TBD map and see if
-			//there is an FQN associated
 			fqn := rs.ProviderConfig.Provider
 			if _, exists := module.Providers[fqn]; !exists {
 				module.Providers[fqn] = moduledeps.ProviderDependency{
diff --git a/terraform/resource_provider.go b/terraform/resource_provider.go
index 27f98c0fe..a085e4fdc 100644
--- a/terraform/resource_provider.go
+++ b/terraform/resource_provider.go
@@ -237,7 +237,8 @@ func ResourceProviderResolverFixed(factories map[addrs.Provider]ResourceProvider
 		ret := make(map[addrs.Provider]ResourceProviderFactory, len(reqd))
 		var errs []error
 		for name := range reqd {
-			// Provider Source Readiness!
+			// FIXME: discovery.PluginRequirements should use addrs.Provider as
+			// the map keys instead of a string
 			fqn := addrs.NewLegacyProvider(name)
 			if factory, exists := factories[fqn]; exists {
 				ret[fqn] = factory
diff --git a/terraform/transform_provider.go b/terraform/transform_provider.go
index 1a5517a18..98cb7a8a3 100644
--- a/terraform/transform_provider.go
+++ b/terraform/transform_provider.go
@@ -668,11 +668,6 @@ func (t *ProviderConfigTransformer) addProxyProviders(g *Graph, c *configs.Confi
 	// Go through all the providers the parent is passing in, and add proxies to
 	// the parent provider nodes.
 	for _, pair := range parentCfg.Providers {
-
-		// FIXME: this is relying on assumptions that the only providers are
-		// legacy-style providers, and will instead need to lookup fqns from the
-		// config when that information is available.
-		//fullAddr := pair.InChild.Addr().Absolute(instPath)
 		fqn := c.Module.ProviderForLocalConfig(pair.InChild.Addr())
 		fullAddr := addrs.AbsProviderConfig{
 			Provider: fqn,