Got rid of Microsoft.Practices.ObjectBuilder2 implementing simple ForEach
Clean up a bit