removed all Windsor and Ninject things, switched to Unity, still needs testing