Use Katana's dependency resolver instead of TinyIoC.cs
Code cleanup