Cleanup namespaces and Task.FromResult