Finished removing Ninject