Fixed StyleCop errors and removed debug lines until we introduce logger support.